From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 5 Mar 2019 18:31:01 +0000 (+0100)
Subject: main: Wait for startup completion before running perf script
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~871^2^2~25
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0427a782bef2aeded1a31426598e5afed41c77f6;p=gnome-shell.git

main: Wait for startup completion before running perf script

The scripts generally assume a functional shell, so wait until
that is the case.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/440
---

diff --git a/js/ui/main.js b/js/ui/main.js
index f9556f14d..061303cf3 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -211,13 +211,6 @@ function _initializeUI() {
 
     _startDate = new Date();
 
-    let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
-    if (perfModuleName) {
-        let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
-        let module = eval('imports.perf.' + perfModuleName + ';');
-        Scripting.runPerfScript(module, perfOutput);
-    }
-
     ExtensionDownloader.init();
     ExtensionSystem.init();
 
@@ -239,6 +232,13 @@ function _initializeUI() {
             Shell.Global.log_structured('GNOME Shell started at ' + _startDate,
                                         ['MESSAGE_ID=' + GNOMESHELL_STARTED_MESSAGE_ID]);
         }
+
+        let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
+        if (perfModuleName) {
+            let perfOutput = GLib.getenv("SHELL_PERF_OUTPUT");
+            let module = eval('imports.perf.' + perfModuleName + ';');
+            Scripting.runPerfScript(module, perfOutput);
+        }
     });
 }